fix: agent manager terminal follows context when switching to local mode#6360
Merged
marius-kilocode merged 5 commits intomainfrom Feb 26, 2026
Merged
fix: agent manager terminal follows context when switching to local mode#6360marius-kilocode merged 5 commits intomainfrom
marius-kilocode merged 5 commits intomainfrom
Conversation
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (5 files)
|
![kilo-code-bot[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
marius-kilocode
force-pushed
the
fix/agent-manager-local-terminal
branch
from
4a43124 to
20e3187
Compare
When switching from a worktree to local mode with a pending tab, currentSessionID() was undefined causing terminal triggers (Cmd+/ and button click) to silently do nothing. Added a showLocalTerminal fallback that opens a terminal at workspace root, and showExistingLocalTerminal to auto-reveal the local terminal when switching contexts.
marius-kilocode
force-pushed
the
fix/agent-manager-local-terminal
branch
from
20e3187 to
a8431cb
Compare
| return null | ||
| } | ||
| if (type === "agentManager.showExistingLocalTerminal") { | ||
| this.terminalManager.showExisting("__local__") |
Contributor
There was a problem hiding this comment.
WARNING: Duplicated reserved terminal key may drift
This hardcoded "__local__" key is duplicated across multiple files. If one side changes, showExistingLocalTerminal silently becomes a no-op because the map lookup misses. Consider centralizing the local terminal key in one shared constant (or adding a dedicated showExistingLocalTerminal() method on the terminal manager) to prevent future regressions.
iscekic
approved these changes
Feb 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
currentSessionID()wasundefined, causing the terminal keyboard shortcut (Cmd+/) and button click to silently do nothing.showLocalTerminalmessage/handler that opens a terminal at workspace root when triggered in local mode without an active session.showExistingLocalTerminalmessage/handler to auto-reveal the local terminal when switching contexts (mirrors the existingshowExistingbehavior for worktree sessions).Changes
SessionTerminalManager.tsshowLocalTerminal()method using__local__keyAgentManagerProvider.tsshowLocalTerminalandshowExistingLocalTerminalmessagesAgentManagerApp.tsxselectLocal()sendsshowExistingLocalTerminalfor pending tabsmessages.tsShowLocalTerminalRequestandShowExistingLocalTerminalRequesttypesagent-manager-arch.test.ts